Merge branch 'master' into next
authorStefan Roese <[email protected]>
Wed, 6 Aug 2008 12:06:07 +0000 (14:06 +0200)
committerStefan Roese <[email protected]>
Wed, 6 Aug 2008 12:06:07 +0000 (14:06 +0200)

Trivial merge